solve the mess of files